Auto merge of #1740 - alexcrichton:update-toml, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 24 Jun 2015 00:48:04 +0000 (00:48 +0000)
committerbors <bors@rust-lang.org>
Wed, 24 Jun 2015 00:48:04 +0000 (00:48 +0000)
Closes #1739


Trivial merge